Merge with xen-ia64-unstable.hg
authorkfraser@localhost.localdomain <kfraser@localhost.localdomain>
Tue, 19 Dec 2006 10:53:17 +0000 (10:53 +0000)
committerkfraser@localhost.localdomain <kfraser@localhost.localdomain>
Tue, 19 Dec 2006 10:53:17 +0000 (10:53 +0000)

Trivial merge